Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Fri, 2 Mar 2012 02:26:27 +0000 (18:26 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Fri, 2 Mar 2012 02:26:27 +0000 (18:26 -0800)

Trivial merge